Merge pull request #173 from JordyHers-org/chore/resolve-conflicts

Merge master into `dev`

.github/CODE_OF_CONDUCT.md

@@ -0,0 +1,41 @@
+
+## Times Up Flutter -  Code of Conduct
+
+We, at JordyHers.com, value and appreciate the contributions of all individuals in our community. Our success is built on the collective efforts, diverse perspectives, and mutual respect of our contributors. As such, we have established this Code of Conduct to guide our interactions and maintain a positive, inclusive, and professional environment.
+
+### 1. **Respect and Inclusivity**
+
+- **Treat everyone with respect:** Respect each individual's ideas, opinions, backgrounds, and experiences, regardless of differences in age, gender, race, ethnicity, religion, sexual orientation, disability, or other characteristics.
+- **Avoid discrimination and harassment:** Discrimination, harassment, or derogatory language towards any individual or group is strictly prohibited. This includes but is not limited to offensive comments, slurs, insults, and unwelcome advances.
+
+### 2. **Professionalism and Integrity**
+
+- **Maintain high ethical standards:** Uphold the highest level of integrity, honesty, and transparency in all communications, interactions, and contributions.
+- **Be accountable for your actions:** Take responsibility for your actions, acknowledge mistakes, and learn from them to continually improve and grow.
+- **Respect intellectual property:** Always respect copyrights, trademarks, and other intellectual property rights. Properly credit the work of others and obtain necessary permissions before using or sharing their content.
+
+### 3. **Collaboration and Teamwork**
+
+- **Foster a collaborative environment:** Encourage open communication, constructive feedback, and collaboration to achieve shared goals and objectives.
+- **Work towards common objectives:** Prioritize the overall success and objectives of the organization, setting aside personal interests and conflicts that may hinder progress.
+
+### 4. **Safety and Privacy**
+
+- **Protect personal information:** Respect the privacy of individuals by not sharing sensitive personal information without consent and refrain from engaging in any activities that could jeopardize the safety or privacy of others.
+- **Maintain a safe environment:** Promote a safe and inclusive environment by reporting any concerns regarding safety or inappropriate behavior to the appropriate channels within the organization.
+
+### 5. **Contribution Guidelines**
+
+- **Follow guidelines and policies:** Adhere to the organization's contribution guidelines, style, and quality standards when creating or submitting content.
+- **Give credit where due:** Properly cite and acknowledge the work and contributions of others, ensuring accurate attribution and acknowledgment.
+
+### 6. **Communication and Feedback**
+
+- **Be constructive in feedback:** Offer feedback in a constructive and respectful manner, focusing on improving outcomes and fostering growth.
+- **Open channels of communication:** Maintain open and clear communication, keeping colleagues and supervisors informed of your progress, challenges, and successes.
+
+By choosing to contribute to Times Up Flutter , you are committing to upholding and abiding by this Code of Conduct.
+Failure to comply with these guidelines may result in appropriate disciplinary action, up to and including revocation of contributor privileges.
+
+---
+

.github/workflows/dart.yml

@@ -16,13 +16,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # Note: This workflow uses the latest stable version of the Dart SDK.
       # You can specify other versions if desired, see documentation here:
       # https://github.com/dart-lang/setup-dart/blob/main/README.md
       # - uses: dart-lang/setup-dart@v1
-      - uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f
+      - uses: dart-lang/setup-dart@8a4b97ea2017cc079571daec46542f76189836b1
 
       #       - name: Install dependencies
       #         run: dart pub get

.github/workflows/deploy-dev.yml

@@ -12,7 +12,8 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
 
       - name: Set up Flutter
         uses: subosito/flutter-action@v2
@@ -30,7 +31,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
 
       - name: Set up Flutter
         uses: subosito/flutter-action@v2
@@ -52,7 +54,8 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
 
       - name: Set up Flutter
         uses: subosito/flutter-action@v2

.github/workflows/deploy-master.yml

@@ -12,7 +12,8 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
 
       - name: Set up Flutter
         uses: subosito/flutter-action@v2
@@ -30,7 +31,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
 
       - name: Set up Flutter
         uses: subosito/flutter-action@v2
@@ -52,7 +54,8 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
 
       - name: Set up Flutter
         uses: subosito/flutter-action@v2

README.md

@@ -56,9 +56,9 @@ Specific ENUMS cases.
 - [share_plus](https://pub.dev/packages/share_plus) for sharing Child's code
 
 ## Contribution
-
-To contribute to the project you can join the discord server:
-Jordyhers https://discord.gg/WaF54U9x
+To have access to fireabse and all necessary credentials and 
+To contribute to the project join the discord server:
+Jordyhers [Discord- JordyHers](https://discord.gg/e4ppDx9Zcy)
 
 
 ## License