From 68c7c6d7ae90044215bdef7cddd6e297717fc84c Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Mon, 18 Jan 2021 21:34:20 +0200 Subject: [PATCH] Change sik.party addresses to sahkoinsinoorikilta.fi --- .env.development | 2 +- .env.prod | 2 +- .env.test | 2 +- .gitlab-ci.yml | 4 +- Dockerfile | 2 +- Dockerfile.prod | 2 +- next.config.js | 5 +- src/components/AdminSidebar.tsx | 2 +- src/components/Footer/FooterContent.tsx | 4 +- src/components/Navigation.tsx | 2 +- src/components/NavigationMobile.tsx | 2 +- src/utils/auth.ts | 4 +- src/views/CorporatePage/CorporatePageView.tsx | 2 +- src/views/FreshmenPage/FreshmenPageView.tsx | 2 +- src/views/StudiesPage/StudiesPageView.tsx | 2 +- tests/testcafe/utils.ts | 96 +++++++++++-------- 16 files changed, 77 insertions(+), 58 deletions(-) diff --git a/.env.development b/.env.development index c1c6747..1b821bd 100644 --- a/.env.development +++ b/.env.development @@ -1 +1 @@ -NEXT_PUBLIC_API_URL=https://api.dev.sik.party/api \ No newline at end of file +NEXT_PUBLIC_API_URL=https://api.dev.sahkoinsinoorikilta.fi/api \ No newline at end of file diff --git a/.env.prod b/.env.prod index 19d6d7d..a280e29 100644 --- a/.env.prod +++ b/.env.prod @@ -1 +1 @@ -NEXT_PUBLIC_API_URL=https://api.sika.sik.party/api \ No newline at end of file +NEXT_PUBLIC_API_URL=https://api.sahkoinsinoorikilta.fi/api \ No newline at end of file diff --git a/.env.test b/.env.test index c1c6747..1b821bd 100644 --- a/.env.test +++ b/.env.test @@ -1 +1 @@ -NEXT_PUBLIC_API_URL=https://api.dev.sik.party/api \ No newline at end of file +NEXT_PUBLIC_API_URL=https://api.dev.sahkoinsinoorikilta.fi/api \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0233031..f387062 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -108,7 +108,7 @@ deploy:dev: - master environment: name: dev - url: dev.sik.party + url: dev.sahkoinsinoorikilta.fi variables: DOCKER_HOST: $DEV_CI_DOCKER_HOST DOCKER_TLS_VERIFY: 1 @@ -130,7 +130,7 @@ deploy:prod: - production environment: name: production - url: sika.sik.party + url: prod.sahkoinsinoorikilta.fi when: manual variables: DOCKER_HOST: $CI_DOCKER_HOST diff --git a/Dockerfile b/Dockerfile index 4c5a5ae..3f6a687 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ COPY public public/ COPY types types/ ENV NEXT_TELEMETRY_DISABLED=1 -ENV NEXT_PUBLIC_API_URL=https://api.dev.sik.party/api +ENV NEXT_PUBLIC_API_URL=https://api.dev.sahkoinsinoorikilta.fi/api RUN npm run build FROM node:14-alpine as server diff --git a/Dockerfile.prod b/Dockerfile.prod index 0953830..26992f1 100644 --- a/Dockerfile.prod +++ b/Dockerfile.prod @@ -9,7 +9,7 @@ COPY public public/ COPY types types/ ENV NEXT_TELEMETRY_DISABLED=1 -ENV NEXT_PUBLIC_API_URL=https://api.sika.sik.party/api +ENV NEXT_PUBLIC_API_URL=https://api.sahkoinsinoorikilta.fi/api RUN npm run build FROM node:14-alpine as server diff --git a/next.config.js b/next.config.js index 8d42db1..81a06e8 100644 --- a/next.config.js +++ b/next.config.js @@ -8,12 +8,11 @@ module.exports = withBundleAnalyzer({ target: "server", images: { domains: [ - "api.sika.sik.party", - "api.dev.sik.party", - "static.sika.sik.party", "sahkoinsinoorikilta.fi", + "prod.sahkoinsinoorikilta.fi", "api.sahkoinsinoorikilta.fi", "static.sahkoinsinoorikilta.fi", + "api.dev.sahkoinsinoorikilta.fi", "placehold.it" ], }, diff --git a/src/components/AdminSidebar.tsx b/src/components/AdminSidebar.tsx index 0ed9b18..ab8bc14 100644 --- a/src/components/AdminSidebar.tsx +++ b/src/components/AdminSidebar.tsx @@ -50,7 +50,7 @@ const AdminSidebar: React.FC = ({ path }) => ( Feed › Signup forms › Job advertisements › - Files › + Files › Logout › ); diff --git a/src/components/Footer/FooterContent.tsx b/src/components/Footer/FooterContent.tsx index a3a03ac..5c9830d 100644 --- a/src/components/Footer/FooterContent.tsx +++ b/src/components/Footer/FooterContent.tsx @@ -85,8 +85,8 @@ const FooterContent: React.FC = () => (
Jäseneksi Palaute - Arkisto - Materiaalipankki + Arkisto + Materiaalipankki
diff --git a/src/components/Navigation.tsx b/src/components/Navigation.tsx index c5bfc2c..b6996cb 100644 --- a/src/components/Navigation.tsx +++ b/src/components/Navigation.tsx @@ -12,7 +12,7 @@ const renderNavigationDesktopItems = () => ( Toiminta Fuksi Kunnianosoitukset - Arkisto + Arkisto diff --git a/src/components/NavigationMobile.tsx b/src/components/NavigationMobile.tsx index 1fa12f1..3522310 100644 --- a/src/components/NavigationMobile.tsx +++ b/src/components/NavigationMobile.tsx @@ -10,7 +10,7 @@ const renderNavigationMobileItems = () => ( Toiminta Fuksi Kunnianosoitukset - Arkisto + Arkisto diff --git a/src/utils/auth.ts b/src/utils/auth.ts index 604401d..d0c5e85 100644 --- a/src/utils/auth.ts +++ b/src/utils/auth.ts @@ -19,7 +19,7 @@ export async function generateToken(username: string, password: string): Promise export function setTokenCookie(token: string) { Cookies.set("jwt", token); - Cookies.set("jwt", token, { domain: ".sik.party" }); + Cookies.set("jwt", token, { domain: ".sahkoinsinoorikilta.fi" }); } export function getTokenCookie(): string { @@ -27,7 +27,7 @@ export function getTokenCookie(): string { } export function deleteTokenCookie(): void { - Cookies.remove("jwt", { domain: ".sik.party" }); + Cookies.remove("jwt", { domain: ".sahkoinsinoorikilta.fi" }); Cookies.remove("jwt"); } diff --git a/src/views/CorporatePage/CorporatePageView.tsx b/src/views/CorporatePage/CorporatePageView.tsx index 1ebbe64..3596b1f 100644 --- a/src/views/CorporatePage/CorporatePageView.tsx +++ b/src/views/CorporatePage/CorporatePageView.tsx @@ -6,7 +6,7 @@ import { import { JobAd } from "@models/JobAd"; import JobAdList from "./JobAdList"; -const EXCURSION_RULES = "https://static.sika.sik.party/saannot/excursiosaannot.pdf"; +const EXCURSION_RULES = "https://static.sahkoinsinoorikilta.fi/saannot/excursiosaannot.pdf"; const YTMK_MAIL = "sik-yritys@list.ayy.fi"; interface CorporatePageViewProps { diff --git a/src/views/FreshmenPage/FreshmenPageView.tsx b/src/views/FreshmenPage/FreshmenPageView.tsx index 3bbdfed..75b0a7d 100644 --- a/src/views/FreshmenPage/FreshmenPageView.tsx +++ b/src/views/FreshmenPage/FreshmenPageView.tsx @@ -57,7 +57,7 @@ const FreshmenPageView: React.FC = () => ( Kipparit (
Alumnien tarinoita

SIKin alumneja löytyy vaikka mistä! Tässä muutama esimerkki erilaisista työtehtävistä ja tarinoista.

Ville Viikari process.env.SITE_URL || "http://localhost:3000"; export const getPageUrl = ClientFunction(() => window.location.pathname); @@ -9,7 +9,7 @@ export const getPageUrl = ClientFunction(() => window.location.pathname); export const getPostRequestLogger = (url: string) => RequestLogger({ url: `${API_URL}/${url}`, method: "post" }, { // logResponseHeaders: true, logResponseBody: true, - stringifyResponseBody: true + stringifyResponseBody: true, }); const openTime = new Date("1994-01-14T22:51:00+02:00"); @@ -23,7 +23,7 @@ export const doLogin = async (t: TestController) => { await t.typeText(Selector("#login-username"), USERNAME); await t.typeText(Selector("#login-password"), PASSWORD); await t.click(Selector("#login-submit")); -} +}; export async function generateToken(): Promise { const tokenUrl = `${API_URL}/api-token-auth/`; @@ -31,28 +31,48 @@ export async function generateToken(): Promise { try { const resp = await axios.post(tokenUrl, { username: USERNAME, - password: PASSWORD + password: PASSWORD, }); - return resp.data["token"]; + return resp.data.token; } catch (err) { console.error(err); throw err; } } - export const generateTestForm = async (jwt: string) => ( - await createForm({ - "title_fi": "Testi Ilmo", - "title_en": "Test Signup", - "visible": true, - "quota": 0, - "start_time": openTime, - "end_time": tomorrow, - "email_content": "E2E Test", - "questions": [{ "id": "XS_Ox5Rry", "name": "Nimi", "type": "name", "options": [], "required": true }, { "id": "Ve02XSEEx", "name": "S-Posti", "type": "email", "options": [], "required": true }, { "id": "luMqnz5y9", "name": "Olen", "type": "radiobutton", "options": ["Nuori", "Vanha", "Testaaja"] }], "id": 14, "isOpen": true, "schema": { "type": "object", "required": ["XS_Ox5Rry", "Ve02XSEEx"], "properties": { "XS_Ox5Rry": { "type": "string", "title": "Nimi" }, "Ve02XSEEx": { "type": ["string"], "title": "S-Posti", "format": "email", "pattern": "^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*$", "default": null }, "luMqnz5y9": { "type": "string", "title": "Olen", "pattern": "^Nuori$|^Vanha$|^Testaaja$", "enum": ["Nuori", "Vanha", "Testaaja"] } } } + createForm({ + title_fi: "Testi Ilmo", + title_en: "Test Signup", + visible: true, + quota: 0, + start_time: openTime, + end_time: tomorrow, + email_content: "E2E Test", + questions: [{ + id: "XS_Ox5Rry", name: "Nimi", type: "name", options: [], required: true, + }, { + id: "Ve02XSEEx", name: "S-Posti", type: "email", options: [], required: true, + }, { + id: "luMqnz5y9", name: "Olen", type: "radiobutton", options: ["Nuori", "Vanha", "Testaaja"], + }], + id: 14, + isOpen: true, + schema: { + type: "object", + required: ["XS_Ox5Rry", "Ve02XSEEx"], + properties: { + XS_Ox5Rry: { type: "string", title: "Nimi" }, + Ve02XSEEx: { + type: ["string"], title: "S-Posti", format: "email", pattern: "^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*$", default: null, + }, + luMqnz5y9: { + type: "string", title: "Olen", pattern: "^Nuori$|^Vanha$|^Testaaja$", enum: ["Nuori", "Vanha", "Testaaja"], + }, + }, + }, }, jwt) -) +); const formURL = `${API_URL}/signupForm/`; @@ -60,7 +80,7 @@ export async function createForm(data, jwt: string) { try { const resp = await axios.post(formURL, data, { headers: { - "Authorization": `JWT ${jwt}`, + Authorization: `JWT ${jwt}`, }, }); return resp.data; @@ -74,7 +94,7 @@ export async function deleteForm(id: string, jwt: string) { try { const resp = await axios.delete(`${formURL}${id}/`, { headers: { - "Authorization": `JWT ${jwt}` + Authorization: `JWT ${jwt}`, }, }); return resp.data; @@ -85,25 +105,25 @@ export async function deleteForm(id: string, jwt: string) { } export const generateTestEvent = async (formIds = [], jwt: string) => ( - await createEvent({ - "tags":[1], - "visible":true, - "start_time": openTime, - "end_time": tomorrow, - "title_fi":"title_fi", - "description_fi":"desc_fi", - "content_fi":"content_fi", - "location_fi":"location_fi", - "title_en":"title_en", - "description_en":"desc_en", - "content_en":"content_en", - "location_en":"location_en", - "image":null, - "signupForm": formIds, - "signup_id": formIds, - "tag_id":[1] + createEvent({ + tags: [1], + visible: true, + start_time: openTime, + end_time: tomorrow, + title_fi: "title_fi", + description_fi: "desc_fi", + content_fi: "content_fi", + location_fi: "location_fi", + title_en: "title_en", + description_en: "desc_en", + content_en: "content_en", + location_en: "location_en", + image: null, + signupForm: formIds, + signup_id: formIds, + tag_id: [1], }, jwt) -) +); const eventURL = `${API_URL}/events/`; @@ -111,7 +131,7 @@ export async function createEvent(data, jwt: string) { try { const resp = await axios.post(eventURL, data, { headers: { - "Authorization": `JWT ${jwt}`, + Authorization: `JWT ${jwt}`, }, }); return resp.data; @@ -125,7 +145,7 @@ export async function deleteEvent(id: string, jwt: string) { try { const resp = await axios.delete(`${eventURL}${id}/`, { headers: { - "Authorization": `JWT ${jwt}` + Authorization: `JWT ${jwt}`, }, }); return resp.data;