Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .env.SAMPLE
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
GOOGLE_CLIENT_ID=see-instructions-in-docs/oauth.md
GOOGLE_CLIENT_SECRET=see-instructions-in-docs/oauth.md
ADMIN_EMAILS=phtcon@ucsb.edu
SOURCE_REPO=https://github.com/ucsb-cs156/proj-scaffold
# PAT_ENCRYPTION_KEY is optional; it is only needed to store GitHub personal
# access tokens. It is commented out because the app refuses to start with a
# malformed value. See instructions in docs/PAT_ENCRYPTION_KEY_instructions.md
# PAT_ENCRYPTION_KEY=see-instructions-in-docs/PAT_ENCRYPTION_KEY_instructions.md
SOURCE_REPO=https://github.com/ucsb-cs156/proj-citelines
6 changes: 3 additions & 3 deletions .github/workflows/43-deploy-main-to-frontiers-prod.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 43-deploy-main-to-scaffold-prod.yml
name: 43-deploy-main-to-citelines-prod.yml
on:
workflow_dispatch

Expand All @@ -7,10 +7,10 @@ env:

jobs:
has_deploy_label:
name: Launch Scaffold Deploy
name: Launch Citelines Deploy
runs-on: ubuntu-latest
steps:
- name: "Launch scaffold deploy"
- name: "Launch citelines deploy"
run: |
gh api \
--method POST \
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/44-deploy-main-to-frontiers-qa.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 44-deploy-main-to-scaffold-qa.yml
name: 44-deploy-main-to-citelines-qa.yml
on:
workflow_dispatch

Expand All @@ -7,10 +7,10 @@ env:

jobs:
has_deploy_label:
name: Launch Scaffold Deploy for QA
name: Launch Citelines Deploy for QA
runs-on: ubuntu-latest
steps:
- name: "Launch scaffold deploy for qa"
- name: "Launch citelines deploy for qa"
run: |
gh api \
--method POST \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ COPY . /home/app
RUN mvn --no-transfer-progress -B -Pproduction -DskipTests -f /home/app/pom.xml clean package

RUN ["chmod", "+x", "/home/app/startup.sh"]
ENTRYPOINT ["/home/app/startup.sh","/home/app/target/scaffold-0.0.1.jar"]
ENTRYPOINT ["/home/app/startup.sh","/home/app/target/citelines-0.0.1.jar"]
15 changes: 4 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# scaffold
# citelines

## Setup before running

Expand Down Expand Up @@ -69,12 +69,13 @@ on port 8090, and drive a headless Chromium browser with Playwright.
INTEGRATION=true HEADLESS=false mvn -ntp -B test-compile failsafe:integration-test failsafe:verify
```

The integration tests are in `src/test/java/edu/ucsb/cs/scaffold/web/`:
The integration tests are in `src/test/java/edu/ucsb/cs/citelines/web/`:

| Test class | What it verifies |
|---|---|
| `OauthWebIT` | User can log in and log out via mock OAuth |
| `HomePageWebIT` | After login, the concept graph is visible on the home page |
| `HomePageWebIT` | After login, the placeholder home page is visible |
| `SwaggerWebIT` | The Swagger UI page loads correctly |

#### Wiremock development mode

Expand Down Expand Up @@ -124,14 +125,6 @@ Spring is configured with:
- `spring.jpa.hibernate.ddl-auto=none`
- `spring.liquibase.change-log=db/migration/changelog-master.json`

### Existing pin -> userid migration

Current migrations include:

- Initial schema creation for current tables.
- Legacy migration from pin-based schema to userid-based schema.
- Legacy PostgreSQL constraint-name normalization.

### Adding a new migration

1. Add a new JSON changelog file in `src/main/resources/db/migration/changes/`.
Expand Down
76 changes: 0 additions & 76 deletions docs/Github_PAT.md

This file was deleted.

108 changes: 0 additions & 108 deletions docs/PAT_ENCRYPTION_KEY_instructions.md

This file was deleted.

42 changes: 0 additions & 42 deletions docs/PrairieLearn_PAT.md

This file was deleted.

Loading
Loading