Skip to content

Commit

Permalink
Merge Staging into Main (#156)
Browse files Browse the repository at this point in the history 
* Bring Staging up to date with Main (#143)

* Merge Staging into Main (#139)

* news carousel adjustments

* adjust explore and tag pages

* work header fixes

* profile header updates

* adjust profile home page

* sizes down work stats on smaller displays

* adjusting works and blogs lists

* Update +layout.svelte

* adding optimizations to section list

* Update +page.svelte

* Update +page.svelte

* Feat/email and recovery (#136)

* feat: password resets and email confirmations

* updating controllers with confirmation guard

* API routes for features now in place

* password resets are in

* email confirmations are now in

* update readme

* Feat/work and comments features (#138)

* Feat/fixing profile forms (#142)

* chore: add beta badge to nav

* chore: fix display of beta badge

* chore: update about panel and version

* adding placeholder for messages panel

* profile forms now work

* fix: redirect approval/rejection notifications to their intended recipient

* adding links form to profile setitngs

* feat: adding links to profile pages

* fix: address issue with layout of admin badge on mobile

* chore: adds unique constraint to the approval queue (#123)

adds a `UNIQUE` constraint to the approval queue table on `work_id`, guaranteeing that works can only ever be submitted to the queue once.

closes #78

* fix: testing new method of obtaining client IP address

* Update Functions.swift

* Update Functions.swift

* fix: addresses issues with pagination on profile pages

* fix: address issue of width on mobile devices for profile pages

* fix: remove more tags button when less than 2 tags

* fix: one last fix for tags display

* fix: make sure transactions are actually being committed

* fix: pagination on works and blogs pages

* Update version.ts

* Update Paginator.svelte

* Update version.ts

* [FIX] Addresses access token expiry issue (#152)

* fix: include parent tags when fetching approval queue

* fix: addresses issue with sessions expiring early

* chore: remove debug lines

* feat: update site version

* feat: adding svelte query

* chore: update swift dependencies

* chore: update client packages

* fix: prevent unauthorized users from creating newsposts

* chore: update readme with latest version of swift

* chore: update version
  • Loading branch information
@Figments
Figments authored Apr 19, 2023
1 parent 494e4c4 commit af175ff
Show file tree
Hide file tree
Showing 10 changed files with 1,104 additions and 790 deletions.
117 changes: 59 additions & 58 deletions Client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,78 +14,79 @@
"format": "prettier --write --plugin-search-dir=. ."
},
"devDependencies": {
"@floating-ui/dom": "^1.1.0",
"@playwright/test": "^1.29.2",
"@sveltejs/adapter-auto": "^1.0.0",
"@sveltejs/adapter-node": "^1.1.0",
"@sveltejs/kit": "^1.0.11",
"@floating-ui/dom": "^1.2.6",
"@playwright/test": "^1.32.3",
"@sveltejs/adapter-auto": "^2.0.0",
"@sveltejs/adapter-node": "^1.2.3",
"@sveltejs/kit": "^1.15.7",
"@tailwindcss/aspect-ratio": "^0.4.2",
"@tailwindcss/forms": "^0.5.3",
"@tailwindcss/line-clamp": "^0.4.2",
"@tailwindcss/line-clamp": "^0.4.4",
"@tailwindcss/typography": "^0.5.9",
"@tanstack/svelte-query": "^4.24.6",
"@tiptap/core": "^2.0.0-beta.199",
"@tiptap/extension-blockquote": "^2.0.0-beta.199",
"@tiptap/extension-bold": "^2.0.0-beta.199",
"@tiptap/extension-bubble-menu": "^2.0.0-beta.199",
"@tiptap/extension-bullet-list": "^2.0.0-beta.199",
"@tiptap/extension-code": "^2.0.0-beta.199",
"@tiptap/extension-color": "^2.0.0-beta.199",
"@tiptap/extension-document": "^2.0.0-beta.199",
"@tiptap/extension-dropcursor": "^2.0.0-beta.199",
"@tiptap/extension-floating-menu": "^2.0.0-beta.199",
"@tiptap/extension-gapcursor": "^2.0.0-beta.199",
"@tiptap/extension-hard-break": "^2.0.0-beta.199",
"@tiptap/extension-heading": "^2.0.0-beta.199",
"@tiptap/extension-history": "^2.0.0-beta.199",
"@tiptap/extension-horizontal-rule": "^2.0.0-beta.199",
"@tiptap/extension-image": "^2.0.0-beta.199",
"@tiptap/extension-italic": "^2.0.0-beta.199",
"@tiptap/extension-link": "^2.0.0-beta.199",
"@tiptap/extension-list-item": "^2.0.0-beta.199",
"@tiptap/extension-ordered-list": "^2.0.0-beta.199",
"@tiptap/extension-paragraph": "^2.0.0-beta.199",
"@tiptap/extension-placeholder": "^2.0.0-beta.199",
"@tiptap/extension-strike": "^2.0.0-beta.199",
"@tiptap/extension-text": "^2.0.0-beta.199",
"@tiptap/extension-text-align": "^2.0.0-beta.199",
"@tiptap/extension-text-style": "^2.0.0-beta.199",
"@tiptap/extension-typography": "^2.0.0-beta.199",
"@tiptap/extension-underline": "^2.0.0-beta.199",
"@tiptap/extension-youtube": "^2.0.0-beta.199",
"@tanstack/svelte-query": "^4.29.1",
"@tiptap/core": "^2.0.3",
"@tiptap/extension-blockquote": "^2.0.3",
"@tiptap/extension-bold": "^2.0.3",
"@tiptap/extension-bubble-menu": "^2.0.3",
"@tiptap/extension-bullet-list": "^2.0.3",
"@tiptap/extension-code": "^2.0.3",
"@tiptap/extension-color": "^2.0.3",
"@tiptap/extension-document": "^2.0.3",
"@tiptap/extension-dropcursor": "^2.0.3",
"@tiptap/extension-floating-menu": "^2.0.3",
"@tiptap/extension-gapcursor": "^2.0.3",
"@tiptap/extension-hard-break": "^2.0.3",
"@tiptap/extension-heading": "^2.0.3",
"@tiptap/extension-history": "^2.0.3",
"@tiptap/extension-horizontal-rule": "^2.0.3",
"@tiptap/extension-image": "^2.0.3",
"@tiptap/extension-italic": "^2.0.3",
"@tiptap/extension-link": "^2.0.3",
"@tiptap/extension-list-item": "^2.0.3",
"@tiptap/extension-ordered-list": "^2.0.3",
"@tiptap/extension-paragraph": "^2.0.3",
"@tiptap/extension-placeholder": "^2.0.3",
"@tiptap/extension-strike": "^2.0.3",
"@tiptap/extension-text": "^2.0.3",
"@tiptap/extension-text-align": "^2.0.3",
"@tiptap/extension-text-style": "^2.0.3",
"@tiptap/extension-typography": "^2.0.3",
"@tiptap/extension-underline": "^2.0.3",
"@tiptap/extension-youtube": "^2.0.3",
"@tiptap/pm": "^2.0.3",
"@types/slug": "^5.0.3",
"@typescript-eslint/eslint-plugin": "^5.48.1",
"@typescript-eslint/parser": "^5.48.1",
"autoprefixer": "^10.4.13",
"axios": "^1.2.2",
"@typescript-eslint/eslint-plugin": "^5.59.0",
"@typescript-eslint/parser": "^5.59.0",
"autoprefixer": "^10.4.14",
"axios": "^1.3.5",
"dayjs": "^1.11.7",
"eslint": "^8.31.0",
"eslint-config-prettier": "^8.6.0",
"eslint": "^8.38.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-svelte3": "^4.0.0",
"felte": "^1.2.6",
"felte": "^1.2.7",
"lodash": "^4.17.21",
"numbro": "^2.3.6",
"postcss": "^8.4.21",
"postcss": "^8.4.22",
"postcss-load-config": "^4.0.1",
"prettier": "^2.8.2",
"prettier-plugin-svelte": "^2.9.0",
"sass": "^1.57.1",
"prettier": "^2.8.7",
"prettier-plugin-svelte": "^2.10.0",
"sass": "^1.62.0",
"slug": "^8.2.2",
"string-strip-html": "^13.0.6",
"svelte": "^3.55.1",
"svelte-check": "^3.0.2",
"svelte-easy-crop": "^1.0.8",
"string-strip-html": "^13.2.3",
"svelte": "^3.58.0",
"svelte-check": "^3.2.0",
"svelte-easy-crop": "^2.0.1",
"svelte-french-toast": "^1.0.3",
"svelte-markdown": "^0.2.3",
"svelte-preprocess": "^5.0.0",
"svelte-remixicon": "^1.0.1",
"svelte-select": "^5.1.0",
"svelte-preprocess": "^5.0.3",
"svelte-remixicon": "^1.1.0",
"svelte-select": "^5.6.0",
"svelte-tiptap": "^0.7.0",
"tailwindcss": "^3.2.4",
"tailwindcss": "^3.3.1",
"tailwindcss-opentype": "^1.1.0",
"tslib": "^2.4.1",
"typescript": "^4.9.4",
"vite": "^4.0.4"
"tslib": "^2.5.0",
"typescript": "^5.0.4",
"vite": "^4.2.2"
},
"type": "module"
}
19 changes: 14 additions & 5 deletions Client/src/lib/server/server-http-service.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Axios, { type AxiosInstance, type AxiosRequestConfig } from "axios";
import Axios, { type AxiosError, type AxiosInstance, type AxiosRequestConfig } from "axios";
import { PUBLIC_API_URL } from "$env/static/public";
import type { ServerResponseError } from "$lib/server/server-response-error";

Expand Down Expand Up @@ -133,10 +133,19 @@ export async function headReqServer<T = unknown>(
});
}

function getError(err: any): ServerResponseError {
function getError(err: AxiosError): ServerResponseError {
if (err.response) {
const response = err.response;
const data = response.data as { reason: string };
return {
statusCode: response.status ?? 500,
message: data.reason ?? response.statusText,
error: response.statusText === "" ? "Internal Server Error" : response.statusText
};
}
return {
statusCode: err.response.status ?? 500,
message: err.response.data.reason ?? err.response.statusText,
error: err.response.statusText === "" ? "Internal Server Error" : err.response.statusText
statusCode: 500,
message: "An unknown error has occurred. Please try again in a little bit.",
error: "Internal Server Error"
};
}
2 changes: 1 addition & 1 deletion Client/src/lib/util/constants/version.ts
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const VERSION = "v1.0.0-beta.4";
export const VERSION = "v1.0.0-beta.5";
Loading

0 comments on commit af175ff

Please sign in to comment.