-
Notifications
You must be signed in to change notification settings - Fork 3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Evaluate meta tests 53 #8
base: master
Are you sure you want to change the base?
Changes from 104 commits
5f985e6
9819671
e671771
2aacbcf
ce4265a
293e03e
e01ce01
bdfe150
136b06a
1ffb1a7
3bf8d62
d7b84ae
c07f390
ea062ce
5ff2f5f
304f06d
a488e41
72f687e
3352422
e55605a
d312b00
f3963e9
83a52bf
64032d4
d088571
8cc3cfa
eb20f83
97988af
c0d619d
8688738
686a3c5
01cf450
e8f23bb
eb510ca
7aff3c7
08f4bae
1689265
b2006df
38626d3
688e463
af73f73
e43a500
7dffb8c
13d2239
76305d7
1d8cc93
8a5403f
ebc5b14
efacbac
8cbcc75
0e0427d
9fefd6d
3d40748
07ab46b
c5f9ec1
84039e8
8154b88
7671b04
762c11f
58c2a18
94a539d
f5dab2c
b65b9f9
ec37ff5
90d247a
bcde267
5286db0
c242c09
c16849a
bcef01b
518fa9e
0c1ca00
2aead3a
f34e6fb
804e22e
eadb87a
c273ba3
4ff36ee
a719f39
352e344
24405fb
4a2991f
e9d9ff0
97004e3
92b2de3
4c47bb3
2bfd557
97f5893
d845c05
a4d1ba8
ac4c119
5ae2d86
d47a4c1
35c3218
15b455e
72a213d
0c8f0c7
6d839ba
9a7350c
c290555
3eaca47
afdfc87
d0cf43b
21e6854
2ad628d
1237dd0
86236c9
2d879e9
35114f2
91c5290
a2d6076
cff20cb
d999483
76fe019
6c8b517
428ddd7
b1dedd3
a8bfae1
88a10c4
599be10
b1b561d
b0f0731
916515e
c9dc21b
fed7519
f1e1f31
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,6 @@ | ||
HOST=0.0.0.0 | ||
PORT=1337 | ||
JWT_SECRET=a3a5d540-4320-45b4-b7ef-0dcf8e07a41e | ||
API_TOKEN_SALT=b706d554059caa52f003a5212613e3ac | ||
IS_PRODUCTION=false | ||
DATABASE_USER=acc-v4 | ||
DATABASE_NAME=acc-v4 | ||
DATABASE_PASSWORD=password |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -82,6 +82,7 @@ ssl | |
nbproject | ||
public/uploads/* | ||
!public/uploads/.gitkeep | ||
.vscode/ | ||
|
||
############################ | ||
# Node.js | ||
|
@@ -102,6 +103,13 @@ node_modules | |
testApp | ||
coverage | ||
|
||
############################ | ||
# Meta Tests | ||
############################ | ||
|
||
src/api/code-challenge/content-types/code-challenge/*.js | ||
!src/api/code-challenge/content-types/code-challenge/lifecycles.js | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why are these being ignored? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is my "scalable" way of dealing with the .js files created during typescript compilation. lifecycles.js had an issue with typescript on strapi. Strapi V4 announced May 12, 2022 they would begin beta support for typescript in this post. Do you want me to investigate the beta support? Currently we are not using TS for the strapi lifecycles hooks file. We originally discussed it here: There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I would love it if you did that. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Also, I don't think the compiled files should go in the same folder as the uncompiled files. I think they should go in a There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Can I restore the previous version using git reset --hard ? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I've decided to wait a month for strapi to continue working out bugs with their beta typescript support There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
I agree with the dist folder, but should the dist folder be a clone of the src folder or just a smaller folder within src? Currently very few files are being used with TS, and TS support is still in beta for strapi There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I would say a clone of the src folder but let me know if you have issues There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I will wait until strapi integrates TS to implement the outDir & srcDir, since I'm not sure if running "strapi start" / "strapi develop" will work with a dist folder yet. |
||
|
||
############################ | ||
# Strapi | ||
############################ | ||
|
@@ -112,3 +120,4 @@ exports | |
*.cache | ||
build | ||
.strapi-updater.json | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,103 @@ | ||
# Strapi application | ||
# Setting up Strapi | ||
|
||
A quick description of your strapi application | ||
### Quickstart | ||
|
||
###### This section only works for mac and linux | ||
|
||
Windows sections will be added later. For now check out these links to set up: | ||
|
||
- Windows: https://www.microfocus.com/documentation/idol/IDOL_12_0/MediaServer/Guides/html/English/Content/Getting_Started/Configure/_TRN_Set_up_PostgreSQL.htm | ||
|
||
#### Setting up database for Mac users | ||
|
||
##### Installing HomeBrew | ||
|
||
1. Install Homebrew by running command: `/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"`. _(This will ask for you password and confirmation of download)_ | ||
2. Check that homebrew is up to date and healty by running: `brew update` then `brew doctor` | ||
|
||
##### Installing postgres | ||
|
||
3. Install Postgres by running: `brew install postgresql` | ||
4. Start Postgres service by running: `brew services start postgresql` | ||
5. If you get error: "Error: role 'postgres' does not exist", run command: `/usr/local/opt/postgres/bin/createuser -s postgres` | ||
|
||
_Remember to run `npm run build` and `npm run develop` after doing these steps._ | ||
|
||
_PS: The step “Downloading Command Line Tools for Xcode” can take very long._ | ||
My best suggestion for that is checking out this discussion: https://github.com/Homebrew/discussions/discussions/131 | ||
|
||
And especially this comment: | ||
|
||
Apple's XCode command-line installer is...quite uncommunicative. You have at least two choices: 1. Wait for as long as it takes...or the installer errors out. 2. Go to https://developer.apple.com/download/more/ (you'll need to sign up for an Apple developer account if you don't have one), then download and install the latest Command Line Tools package that your OS supports. | ||
|
||
### Import database | ||
|
||
After setting up strapi, you need to import the database. This is how you do that. | ||
|
||
1. First, add the database file to the native layer in your repo. It should be named something like “backup-remote-….-.pgsql” | ||
2. In your terminal, go into postgres: `psql template0` | ||
3. Check roles: `\du` | ||
- You will most likely see that you are a "superuser" in some databases, some not. This gives special admin rights to the database, which you will need | ||
4. Create database for this project, call it "acc-v4": `CREATE DATABASE "acc-v4"`. | ||
5. Make yourself a superuser: `alter user [username] with superuser`. | ||
6. Add login permission: `alter role [username] with login` | ||
7. Exit postgres: `\q` | ||
8. Import the database: `pg_restore -U [username] -d acc-v4 -1 [name-of-file]` | ||
9. Run `yarn build` and then `yarn develop`. You should now be set up. Go to http://localhost:1337/admin/ (Or whatever localhost it is running on) and check! | ||
|
||
#### Notes: | ||
|
||
- To import the database correctly, it needs to be totally empty when you do it. When you are not familiar with PostgreSQL it is easy to type wrong, make small mistakes etc., which can lead to the database not being ready to import when you try. This can be easily solved by deleting the database `DROP DATABASE [name-of-database]` and creating a new one `CREATE DATABASE [name-of-database]`. This will give you a clean slate to try importing again. | ||
- Always remember `;` at the end of your lines, commands in PostgreSQL wont run without them. If you forget, just type `;` in the next line and press `ENTER`. | ||
- Backslash is achieved with `SHIFT+OPTION+7`on a Mac. | ||
|
||
### More info | ||
|
||
Most of the steps here are taken directly from this website: https://www.moncefbelyamani.com/how-to-install-postgresql-on-a-mac-with-homebrew-and-lunchy/. There is more to learn there. | ||
|
||
HomeBrew is a package manager that takes care of everything NPM or Yarn doesn´t. Read more about it on https://brew.sh/ | ||
|
||
It will ask for your password and to confirm the download. | ||
|
||
Beware that the step “Downloading Command Line Tools for Xcode” can take very long. My best suggestion for that is checking out this discussion: | ||
|
||
https://github.com/Homebrew/discussions/discussions/131 | ||
|
||
And especially this comment: | ||
|
||
Apple's XCode command-line installer is...quite uncommunicative. You have at least two choices: 1. Wait for as long as it takes...or the installer errors out. 2. Go to https://developer.apple.com/download/more/ (you'll need to sign up for an Apple developer account if you don't have one), then download and install the latest Command Line Tools package that your OS supports. | ||
|
||
Don´t worry, it takes some time, but will complete in the end. | ||
|
||
After all this, you might get the error: “error: role "postgres" does not exist” | ||
|
||
To solve that, simply run this in the command line: | ||
|
||
/usr/local/opt/postgres/bin/createuser -s postgres | ||
|
||
Then, run "yarn build” and "yarn develop” again and you should be good! | ||
|
||
### Useful git commands | ||
|
||
When you work on this project, you will du that on your own fork. You will make branches for each added feature, push changes and then merge the branches when the feature are reviewed by others. Here is a breakdown of your workflow: | ||
|
||
1. Set upstream repo. Olivers repo is our "source of truth": `git remote add upstream [email protected]:oriooctopus/acc-v4.git` | ||
2. Pull master - make sure you´re up to date: `git pull` | ||
3. Make a branch for the change you´re about to make: `git checkout -b [name-of-branch]` | ||
4. Make the changes/Write the code | ||
5. Add changes with `git add [name-of-file` | ||
6. Commit changes with `git commit -m "[notes about changes]"` | ||
7. Push changes: `git push origin HEAD` | ||
8. Go to github and make a pull request for your changes. | ||
|
||
#### Notes | ||
|
||
In general there is some thing you need to learn about working with git. Don´t be afraid to ask. You should also go through this tutorial on git branching, it is very helpful: https://learngitbranching.js.org/ | ||
|
||
- Git Lens is a very helpful VSCode extension: Go install it. (Add picture etc.) | ||
- When you have made your branch, you can check your branches by entering this command: `git branch`. It will also tell you which branch you are on. | ||
- When you have made a pull request on a branch and make more changes. Don´t make another pull request, it will update when you push the new changes. | ||
- When you type git rebase -I HEAD~[num] you, for some fucking unknown reason, enter this vim fuckery. Without a fucking course you will also be stuck there and god forbid the changes you want to make will actually be made. So, here is a little guide for how to deal with this godforsaken dickcheese of a feature. | ||
- :q - no changes were made | ||
- :q! - trash all changes | ||
- :wq - save the changes and quit |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What's the reason for this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
.vscode/launch.json is a config file that gets added to the project from the vscode debugger.
I wanted to keep all vscode config files out of our final repo