Skip to content
This repository has been archived by the owner on Nov 6, 2023. It is now read-only.

Exm new #352

Open
wants to merge 124 commits into
base: exm-improve
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
124 commits
Select commit Hold shift + click to select a range
fc53c58
avatar image add on form
Gerelsukh Sep 19, 2023
55732d9
direct massage avatar initial center
Gerelsukh Sep 19, 2023
88f1b91
exm-core config add field
Gerelsukh Sep 19, 2023
67976fb
remove welcome content from exm core
Gerelsukh Sep 19, 2023
6fe5479
color add on exm-core
Gerelsukh Sep 19, 2023
6d45619
update
Sep 21, 2023
d5f8544
update
Sep 21, 2023
bf5187c
Merge branch 'chat-exm-improve' of github.com:erxes/erxes-community i…
Gerelsukh Sep 21, 2023
b5b8591
update
Sep 21, 2023
0ce814b
Merge branch 'exm-new' of github.com:erxes/erxes-community into exm-new
Sep 21, 2023
1f5cc65
update
Sep 21, 2023
a34329a
update
Sep 21, 2023
7b7a126
update
Sep 22, 2023
3ba8f8c
login page css add
Gerelsukh Sep 22, 2023
6ca1b5b
Merge branch 'exm-new' of github.com:erxes/erxes-community into exm-new
Gerelsukh Sep 22, 2023
7c50218
update
Sep 22, 2023
9eaad9e
Merge branch 'exm-new' of github.com:erxes/erxes-community into exm-new
Sep 22, 2023
148a7ca
sidebar css added
Gerelsukh Sep 25, 2023
4231a79
some update
Gerelsukh Sep 25, 2023
d04b83d
update
Sep 25, 2023
e85fa65
layout and sidebar update
Gerelsukh Sep 25, 2023
abd5bc9
Merge branch 'exm-new' of github.com:erxes/erxes-community into exm-new
Gerelsukh Sep 25, 2023
1373579
update
Sep 25, 2023
314b0dc
Merge branch 'exm-new' of github.com:erxes/erxes-community into exm-new
Sep 25, 2023
756bc50
update
Sep 25, 2023
c88a6a8
update
Gerelsukh Sep 25, 2023
df22d5c
Merge branch 'exm-new' of github.com:erxes/erxes-community into exm-new
Gerelsukh Sep 25, 2023
629e5b1
chatlist and chatitem add
Gerelsukh Sep 26, 2023
e8274de
update
Sep 26, 2023
7151637
chatItem && Chatlist update
Gerelsukh Sep 26, 2023
cbef7ae
Merge branch 'exm-new' of github.com:erxes/erxes-community into exm-new
Gerelsukh Sep 26, 2023
92486e3
chats infinityScroll added
Gerelsukh Sep 26, 2023
24d4c6f
createChat modal add
Gerelsukh Sep 26, 2023
8e38f0d
update
Sep 26, 2023
3e3c540
pin chat add
Gerelsukh Sep 27, 2023
72b5c19
update
Gerelsukh Sep 27, 2023
1a8c134
update
Sep 27, 2023
5de5f95
update
Gerelsukh Sep 27, 2023
e544267
Merge branch 'exm-new' of github.com:erxes/erxes-community into exm-new
Gerelsukh Sep 27, 2023
0c58777
update
Sep 27, 2023
0581315
Merge branch 'exm-new' of github.com:erxes/erxes-community into exm-new
Sep 27, 2023
50a9e31
post form add
Gerelsukh Sep 28, 2023
fa91fe0
update
Sep 28, 2023
8ec4759
form add
Gerelsukh Sep 28, 2023
295906b
Merge branch 'exm-new' of github.com:erxes/erxes-community into exm-new
Gerelsukh Sep 28, 2023
0362d86
update]
Sep 28, 2023
959f63d
uploader add
Gerelsukh Sep 28, 2023
30cea23
Merge branch 'exm-new' of github.com:erxes/erxes-community into exm-new
Sep 28, 2023
8edde29
update
Sep 28, 2023
d8bf14c
update
Sep 28, 2023
71d944e
form update
Gerelsukh Sep 28, 2023
4ffdad4
close modal
Gerelsukh Sep 28, 2023
e879682
createchat
Gerelsukh Sep 29, 2023
b3b7664
update
Sep 29, 2023
c1431e3
update
Sep 29, 2023
4bf06f3
update
Sep 29, 2023
a479734
sidebar layout update
Gerelsukh Sep 29, 2023
9fe6cf8
form callback add
Gerelsukh Sep 29, 2023
18779bb
update
Sep 29, 2023
027aac6
Merge branch 'exm-new' of github.com:erxes/erxes-community into exm-new
Sep 29, 2023
01d3527
update
Sep 29, 2023
f32abf6
logo change
Gerelsukh Sep 29, 2023
5647528
Merge branch 'exm-new' of github.com:erxes/erxes-community into exm-new
Gerelsukh Sep 29, 2023
b4ef5a2
update
Sep 29, 2023
ac5daa5
update
Sep 29, 2023
d6bb73a
sidebar update
Gerelsukh Sep 29, 2023
eb88c83
Merge branch 'exm-new' of github.com:erxes/erxes-community into exm-new
Gerelsukh Sep 29, 2023
58a42f8
update
Sep 29, 2023
dc6b4aa
Merge branch 'exm-new' of github.com:erxes/erxes-community into exm-new
Sep 29, 2023
2fe6173
sidebar update
Gerelsukh Sep 30, 2023
e71b51f
postItem conponent add
Gerelsukh Sep 30, 2023
b9fcbad
Merge branch 'exm-new' of github.com:erxes/erxes-community into exm-new
Gerelsukh Sep 30, 2023
7edf11e
feed image
Gerelsukh Sep 30, 2023
1a80f0e
update feed
Gerelsukh Sep 30, 2023
662e275
update
Sep 30, 2023
e98f26a
attachment add
Gerelsukh Sep 30, 2023
7219063
Merge branch 'exm-new' of github.com:erxes/erxes-community into exm-new
Gerelsukh Sep 30, 2023
ac4d959
update
Sep 30, 2023
fa82bf1
Merge branch 'exm-new' of github.com:erxes/erxes-community into exm-new
Sep 30, 2023
acc53e7
update
Sep 30, 2023
8cf294e
delete pin feed add
Gerelsukh Sep 30, 2023
21af2bc
Merge branch 'exm-new' of github.com:erxes/erxes-community into exm-new
Gerelsukh Sep 30, 2023
ff0455c
tab active
Gerelsukh Sep 30, 2023
13e2433
update
Sep 30, 2023
41aee1c
Merge branch 'exm-new' of github.com:erxes/erxes-community into exm-new
Sep 30, 2023
11f8ee8
event
Gerelsukh Sep 30, 2023
8462a0b
Merge branch 'exm-new' of github.com:erxes/erxes-community into exm-new
Gerelsukh Sep 30, 2023
963c13e
event
Gerelsukh Sep 30, 2023
dd07650
update
Gerelsukh Sep 30, 2023
c2273fa
update
Sep 30, 2023
e620d49
Merge branch 'exm-new' of github.com:erxes/erxes-community into exm-new
Sep 30, 2023
a1146b7
update
Gerelsukh Sep 30, 2023
9eb225e
update
Sep 30, 2023
efaecfe
update
Gerelsukh Sep 30, 2023
5274a95
update
Sep 30, 2023
b151efa
Merge branch 'exm-new' of github.com:erxes/erxes-community into exm-new
Gerelsukh Sep 30, 2023
c671322
update
Sep 30, 2023
4dd8cfd
update
Gerelsukh Sep 30, 2023
3faaff3
Merge branch 'exm-new' of github.com:erxes/erxes-community into exm-new
Gerelsukh Sep 30, 2023
16f1585
update
Gerelsukh Sep 30, 2023
b913dea
update
Gerelsukh Sep 30, 2023
92414ed
update
Sep 30, 2023
5e0094f
Merge branch 'exm-new' of github.com:erxes/erxes-community into exm-new
Sep 30, 2023
4dc13e7
update
Sep 30, 2023
bff7496
update
Sep 30, 2023
7016643
update
Oct 1, 2023
8ee7d65
update
Oct 1, 2023
99352ea
update
Oct 1, 2023
5092b22
merge
Oct 1, 2023
140d021
merge
Oct 1, 2023
e82bc13
update
Oct 2, 2023
1771bef
merge
Oct 2, 2023
71a43a7
update
Oct 2, 2023
f8a1364
update
Oct 2, 2023
a8bea5c
update
Oct 2, 2023
7935bf1
sidebar add
Gerelsukh Oct 2, 2023
557e55b
update
Gerelsukh Oct 2, 2023
bf1d71f
update
Gerelsukh Oct 2, 2023
c9efffb
update
Gerelsukh Oct 2, 2023
a995d8b
update
Gerelsukh Oct 2, 2023
f513fd9
update
Gerelsukh Oct 2, 2023
8ce1f6c
Merge branch 'exm-new' of github.com:erxes/erxes-community into exm-new
Gerelsukh Oct 2, 2023
8fabfa3
Merge branch 'exm-improve' of github.com:erxes/erxes-community into e…
Gerelsukh Oct 2, 2023
5ad6ecb
update
Gerelsukh Oct 2, 2023
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
Prev Previous commit
Next Next commit
merge
  • Loading branch information
Enkhtuvshin Narmandakh authored and Enkhtuvshin Narmandakh committed Oct 1, 2023
commit 5092b2285f1322544325bfc41af685f7cf16e95e
8 changes: 4 additions & 4 deletions packages/gateway/src/apollo-router/index.ts
Original file line number Diff line number Diff line change
@@ -30,7 +30,9 @@ export const stopRouter = (sig: NodeJS.Signals) => {
if (!routerProcess) {
return;
}
try { routerProcess.kill(sig); } catch (e) {
try {
routerProcess.kill(sig);
} catch (e) {
console.error(e);
}
};
@@ -96,9 +98,7 @@ const createRouterConfig = async () => {
fs.writeFileSync(routerConfigPath, yaml.stringify(config));
};

export const startRouter = async (
proxyTargets: ErxesProxyTarget[]
) => {
export const startRouter = async (proxyTargets: ErxesProxyTarget[]) => {
await supergraphCompose(proxyTargets);
await createRouterConfig();
await downloadRouter();
5 changes: 4 additions & 1 deletion packages/gateway/src/index.ts
Original file line number Diff line number Diff line change
@@ -21,7 +21,10 @@ import {
applyProxyToCore
} from './proxy/create-middleware';
import { startRouter, stopRouter } from './apollo-router';
import { startSubscriptionServer, stopSubscriptionServer } from './subscription';
import {
startSubscriptionServer,
stopSubscriptionServer
} from './subscription';
import { publishRefreshEnabledServices } from '@erxes/api-utils/src/serviceDiscovery';

const {
8 changes: 6 additions & 2 deletions packages/gateway/src/subscription/SubscriptionResolver.ts
Original file line number Diff line number Diff line change
@@ -263,10 +263,14 @@ export default class SubscriptionResolver {
return merge(payloadData, Object.values(response.data)[0]);
}
} catch (error) {
console.error('----------------- subscription resolver request error ---------------------------');
console.error(
'----------------- subscription resolver request error ---------------------------'
);
console.error('query', query);
console.error('error', error);
console.error('---------------------------------------------------------------------------------');
console.error(
'---------------------------------------------------------------------------------'
);
}
}

4 changes: 1 addition & 3 deletions packages/gateway/src/subscription/index.ts
Original file line number Diff line number Diff line change
@@ -51,9 +51,7 @@ export function makeSubscriptionSchema({ typeDefs, resolvers }: any) {
});
}

export async function startSubscriptionServer(
httpServer: http.Server
) {
export async function startSubscriptionServer(httpServer: http.Server) {
const wsServer = new ws.Server({
server: httpServer,
path: '/graphql'
9 changes: 6 additions & 3 deletions pos/app/(main)/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
"use client"

import "@/styles/globals.css"

import dynamic from "next/dynamic"
import CheckAuth from "@/modules/auth/checkAuth"
import Configs from "@/modules/auth/configs"

interface ILayoutProps {
import { getMode } from "@/lib/utils"

const EventListener = dynamic(() => import("@/modules/kiosk/EventListener"))

interface LayoutProps {
children: React.ReactNode
}

export default function RootLayout({ children }: ILayoutProps) {
export default function RootLayout({ children }: LayoutProps) {
return (
<Configs>
<CheckAuth>
9 changes: 8 additions & 1 deletion pos/components/ui/tabs.tsx
Original file line number Diff line number Diff line change
@@ -11,7 +11,14 @@ const TabsList = React.forwardRef<
React.ElementRef<typeof TabsPrimitive.List>,
React.ComponentPropsWithoutRef<typeof TabsPrimitive.List>
>(({ className, ...props }, ref) => (
<TabsPrimitive.List ref={ref} className={cn("", className)} {...props} />
<TabsPrimitive.List
ref={ref}
className={cn(
"inline-flex h-9 items-center justify-center rounded-md bg-slate-100 p-1 text-slate-500",
className
)}
{...props}
/>
))
TabsList.displayName = TabsPrimitive.List.displayName

You are viewing a condensed version of this merge commit. You can view the full changes here.