Skip to content

Commit a1ce2ec

Browse files
EricSvebakkEricSvebakk
committed
Merge branch 'pr/53' into development
2 parents 4f7d813 + f06a472 commit a1ce2ec

File tree

50 files changed

+33
-39
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+33
-39
lines changed

‎.github/workflows/deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
DATABASE_URL = 'mysql://${{ secrets.DATABASE_USER }}:${{ secrets.DATABASE_PASSWORD }}@localhost:3306/${{ secrets.DATABASE_NAME }}'
3030
3131
NEXTAUTH_URL = '${{ vars.NEXTAUTH_URL }}'
32-
NEXTAUTH_CALLBACK = '${{ secrets.NEXTAUTH_URL }}/pages/main/home'
32+
NEXTAUTH_CALLBACK = '${{ secrets.NEXTAUTH_URL }}/'
3333
NEXTAUTH_SECRET = '${{ secrets.NEXTAUTH_SECRET }}'
3434
3535
NEXTAUTH_GITHUB_CLIENT_ID = '${{ vars.NEXTAUTH_GITHUB_CLIENT_ID }}'

‎.github/workflows/development.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
DATABASE_URL = 'mysql://${{ secrets.DATABASE_USER }}:${{ secrets.DATABASE_PASSWORD }}@localhost:3306/${{ secrets.DATABASE_NAME }}'
3030
3131
NEXTAUTH_URL = '${{ vars.NEXTAUTH_URL }}'
32-
NEXTAUTH_CALLBACK = '${{ secrets.NEXTAUTH_URL }}/pages/main/home'
32+
NEXTAUTH_CALLBACK = '${{ secrets.NEXTAUTH_URL }}/'
3333
NEXTAUTH_SECRET = '${{ secrets.NEXTAUTH_SECRET }}'
3434
3535
NEXTAUTH_GITHUB_CLIENT_ID = '${{ vars.NEXTAUTH_GITHUB_CLIENT_ID }}'

‎README.md‎

Lines changed: 1 addition & 1 deletion

‎app/pages/main/home/layout.js‎ renamed to ‎app/(pages)/(main)/(home)/layout.js‎

File renamed without changes.

‎app/pages/main/home/page.js‎ renamed to ‎app/(pages)/(main)/(home)/page.js‎

File renamed without changes.

‎app/pages/main/aboutCYB/layout.js‎ renamed to ‎app/(pages)/(main)/aboutCYB/layout.js‎

File renamed without changes.

‎app/pages/main/aboutCYB/page.js‎ renamed to ‎app/(pages)/(main)/aboutCYB/page.js‎

File renamed without changes.

‎app/pages/main/aboutEscape/layout.js‎ renamed to ‎app/(pages)/(main)/aboutEscape/layout.js‎

File renamed without changes.

‎app/pages/main/aboutEscape/page.js‎ renamed to ‎app/(pages)/(main)/aboutEscape/page.js‎

File renamed without changes.

‎app/pages/main/aboutEscape/rentingEscape/layout.js‎ renamed to ‎app/(pages)/(main)/aboutEscape/rentingEscape/layout.js‎

File renamed without changes.

0 commit comments

Comments
 (0)